From c23a9212d0d12c72c1999e1d24221b577321aed7 Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@gmail.com>
Date: Wed, 1 Jan 2014 00:13:43 +0000
Subject: [PATCH] Fix tiger, google leaks by forcing them into the QString
 mkshort.

---
 gpsbabel/google.cc | 7 +------
 gpsbabel/tiger.cc  | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/gpsbabel/google.cc b/gpsbabel/google.cc
index 2e3e6bc91..0ab3e5fd8 100644
--- a/gpsbabel/google.cc
+++ b/gpsbabel/google.cc
@@ -124,12 +124,7 @@ void goog_segment(xg_string args, const QXmlStreamAttributes* unused)
 
   wpt_tmp = route_find_waypt_by_name(routehead[goog_segroute], goog_segname);
   if (wpt_tmp) {
-#if NEW_STRINGS
-    wpt_tmp->shortname = QString();
-#else
-    xfree(wpt_tmp->shortname);
-#endif
-    wpt_tmp->shortname = mkshort(desc_handle, CSTRc(args));
+    wpt_tmp->shortname = mkshort(desc_handle, args);
     wpt_tmp->description = args;
   }
 }
diff --git a/gpsbabel/tiger.cc b/gpsbabel/tiger.cc
index ea902aa96..7475ab353 100644
--- a/gpsbabel/tiger.cc
+++ b/gpsbabel/tiger.cc
@@ -171,7 +171,7 @@ data_read(void)
       wpt_tmp->longitude = lon;
       wpt_tmp->latitude = lat;
       wpt_tmp->description = desc;
-      wpt_tmp->shortname = mkshort(mkshort_handle, desc);
+      wpt_tmp->shortname = mkshort(mkshort_handle, QString(desc));
 
       waypt_add(wpt_tmp);
     }
-- 
2.30.2